Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 25 Jun 2010 23:19:18 +0000 (23:19 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 25 Jun 2010 23:19:18 +0000 (23:19 +0000)
commitecbe2036d92f4fdda71706306fd10651c49d7edf
tree8b4183d29bd58f86232a6329a570c616b78bc0bc
parent0722a0652d8160485850d0853c1fb720b8f41797
parent118b7d384e5ce9285bddda2a7a2e2b04c2bbb9e8
Merge from mainline.